Merge bb692ca848c3a70fcc041b31fe5e4c6af987dd33 on remote branch

Change-Id: I5b316b5ddef788f1297b263d7c90c72ffdf0ccbf