Merge 617abce47fcc96fa654d843ab887e762eb631bcc on remote branch

Change-Id: I8a106d174efb0d1a6d622a8b2dc3c4bb3e07c164