Merge 4b90e06ec3e20955d327a9da9e806b2591967b00 on remote branch

Change-Id: If9df9cdf604e107130938205c186231f73847b4d