Merge 1ae2e60f6bc651b7a9cb2be1b54f8b48e59061a1 on remote branch

Change-Id: Ibce2e7399464c5beac0e0910f9c6e4de46355a29