Merge ccfb873bd14b4a7e0e2e1eb5504f2587bd25479e on remote branch

Change-Id: I345b47b454912dd501b885f7adaa94c1e614ca5d