Merge 94bc448999b2dba28177e82b388766d7e1603363 on remote branch

Change-Id: I1768e719951877305513e718548d42ced4d28876