Merge b447397bc743437d4e27d5c98b3ee52243bc7fc9 on remote branch

Change-Id: I7a2c27c2b4ed82f6d6df2b0a591aa5542d5bb338