Merge 7dd747554250ea6875fac0c741f9a3fc570792cf on remote branch

Change-Id: Ie400c7b349d12358a94ec772c901df08e358b9e9