Merge fbc1742064feba2c0262a34e8345b6506039bca9 on remote branch

Change-Id: Icadbb00938c7b8fca2a1d4a9cbcaa8a60b406efe