Merge fc720c3c744c29ec64f5c9930556df3e5d7d4467 on remote branch

Change-Id: Ic607db32ad804a880a0c8dbe17573694ed1dd5d0