Merge 3d0069c08183affc4c27b980404f8cabf8cdf3a0 on remote branch

Change-Id: I1f1eac7e960691a1b449845dc5ba05d2b2464b19