Merge deabed12786e02e02f841d4b0bf7b22f8b6b3ab5 on remote branch

Change-Id: I4bf240ab0f0766d38e0bea427465335e51a9d84f