Merge b26ec269cd78d2b7ffd55e3e349e762087bb6b2a on remote branch

Change-Id: Id6ca39c05604436c900ec39a5a7323451cd14190