(cherry picked from commit c932690c5a9d0aedfd2580e5c5e9f79e32f54261) Change-Id: Ibddab4252ecefa1c410430b89f94aba4d3ae1c96