Merge 7946d0d356035540626c23133c346ba0d5162f0c on remote branch

Change-Id: I444404899487613ee3319b1aad95f18a71957d30