Merge 9884b8fc47f348153b0dd5a5c204271c7f1b873a on remote branch

Change-Id: I398c4317767b7e0c499d1b4fb42af64ea9486441