Merge 7ba50b4efa4852c10dc3cea75f3ee0f7c686f86f on remote branch

Change-Id: Ie61b1b973daae7bc028e34135d77a714947198ae