Merge 31ba6d52253561e213a436ec813a48cdaebc8bf6 on remote branch

Change-Id: I0857ef2f1e87c78d0acf41479c70b9398d02dca4