Merge 8497b5a572574454433f0dc623665d3904e12b40 on remote branch

Change-Id: I4ac54c5dfb2ae4f1336e10619e152d8e86d90893