Merge b26ec269cd78d2b7ffd55e3e349e762087bb6b2a on remote branch

Change-Id: Iac6a5c4fca0e517ee9c28b779e76594e1e90feb0