Merge f484dbc19a59354cad913007f86569aef984ff62 on remote branch

Change-Id: I5eb3dc43d7dab8a185b24288c8634b8a8aa3f10f