Merge 2603d19365439752e954be03a62debe7403c65c4 on remote branch

Change-Id: Ifeb3ced8a5f3f12fd6dc62298af404a363def563