Merge 9fcaa14b8084532c25347bc76af5c2ea8ea2eb69 on remote branch

Change-Id: I356e1c6163f448167be75cdc1dbb571a54eab293