Merge 94cc14ea002e1992091525b2b09936f55c609219 on remote branch

Change-Id: If7174825f53414a48b57a6048a0e6d2e6f22b3cf