Change-Id: I4359f59a73a278a941f4bb9d106dd38c9cb471fe (cherry picked from commit 6d7eedfd28cc1712690db2f6ca8a281b0901ee28)