Merge 72979dbff55d6e15be2c57904174731237c22601 on remote branch

Change-Id: I8fa07c1018005b6663d97b7b53eea0bec00a0e33