Merge 60e9ed2236c1346f4fffe7e69b027751f8708f38 on remote branch

Change-Id: Iacffa7e6f7ca8d74b25a1ca0a1c31c4cd64c5b0d