Merge 47c34c8ea639c7e2ccf6b3b361473d5c534923e4 on remote branch

Change-Id: I363d75799c91e150aa82a4fd2bf0605e1f22da40