Merge 12fa6cd08061b78ae0cabf05d669444c660b4216 on remote branch

Change-Id: Ibe47a5215ccc1d0f086a9c25129e60bccf052f7f