Merge b447397bc743437d4e27d5c98b3ee52243bc7fc9 on remote branch

Change-Id: I27d630ccd0dcd9b873ca031b2236081bbf61a987