Merge 12b44074ced1c931fd567fd0a35775e896e1aaf7 on remote branch

Change-Id: I5744d6f3b9b08576b57fa64b5fc867cfc710fbeb