Merge 4bfd9b472a2ec1296d02445340fe969c5ce12fa6 on remote branch

Change-Id: Iab775a22d35c38bd053fc43ba32bef91db1f0939