Merge bed1dec33b7cbac9dc1e2a169288425c8e24b1bb on remote branch

Change-Id: I82d4fb6229331befc565982eff3a612856e980b7