Merge c0055093deefc58d65358d2022ae32cb9d256d23 on remote branch

Change-Id: I34f5928391881597ff0611f2a631cd01bf7cd681