Merge 62a808f0811517c74e56a875dc7f8e5c960b9370 on remote branch

Change-Id: I3d28b7822e4669f99d1353c08cc5ebd01c0a23a4