Merge 08782496ca3dd54b0c3e5233bfef0f977089308f on remote branch

Change-Id: I598b7fe6b201e012e2bd81b866d7b05069c4512d