Merge c39e77f936a89bdb7eac0c01b5972e21ea844248 on remote branch

Change-Id: Iaa4a68814503ed05d0e3ff4d3e3c57cc11546210