Change-Id: Ie42365a3a8b9e7f763c21e3f9be9e9abfc35dbf7 (cherry picked from commit e800860179913ce9c37bb378ff27ecb1c68d81dd)