Merge 3004865bddca04de3ef716ef5c5e8a7faeac6978 on remote branch

Change-Id: Ic4e4d08d31a3da02556b8cd2125b03c09b4959fa