Merge f139a71b53df91da185059fb59bd9b5af2a32e9b on remote branch

Change-Id: Iecb4622231c8078980f2249993da447cdaaf9dcc