Change-Id: I09db011ff6e3346d24b9ac86ca107e07d4a7c542 (cherry picked from commit e217689000e33854b945e8925d84efddf178f716)