Merge 4ac9314a195e6d2a232a90b60e62adc599555b24 on remote branch

Change-Id: I2542731958c2acd346b5fbdbe1eb9ceb37796efe