Merge 00a8ef4f4a227818c0dd8c57d2b694bfdfab74a4 on remote branch

Change-Id: I235f85ef4fa6d56fc7334f308a22d4794a374eb0