Merge ab152003b80bd27babea885685b34a7b14242246 on remote branch

Change-Id: Ifc536f7f56e8050030bc9ecee76acb764449b82f