Merge 1588091e95576a3cfff7609857a2937ee67f3554 on remote branch

Change-Id: I2312eea8e0e627806725083fb343f3a55ff4d7cd