Merge ad838a9aa1c43215c8809e433500748894047037 on remote branch

Change-Id: I9e3c28f087e57e6a111e76d0be241dedde614777