Merge 656f542dc49cd0f75bf72eabc5a9ac41bf164303 on remote branch

Change-Id: I62e6aed9effb50dd8d0b17ded645f8bd8aaaacdb