Merge 6f344847a99a68c2969528596bc5c9affacab221 on remote branch

Change-Id: I970b23589d967439e83a15e617146724fa4f89d0