Merge 43206e4a8104e6abca382ef4463dd74e9bf71018 on remote branch

Change-Id: I4fb256009e2344b80206c07ca6bdd179a45b3762