Merge 6febaba6497c1b5df3131316e0ec4ec817451749 on remote branch

Change-Id: Id768dc15affe34cbe220bfa8a1634f40bb9e2450