Merge dd6039d4a998cac6eeef16d0d211a06031cea6f9 on remote branch

Change-Id: Icf99c799295ca5ebc0cc1f7fb73d09eea65a4135