Merge 70c60b5c1f761a915c03a2a125ce3d8d0d251ca3 on remote branch

Change-Id: Ib410d7f30b974f2eccde2eab6925122c6f5bc300