Merge 6a472718a2637ba7c1cd0b1d253b4b54ee31cf0b on remote branch

Change-Id: I7d886429a9101deb4900ec60087ed4b3c3f1e75a