Merge 479bb9c268eb0d34227eab1c391c86272c161844 on remote branch

Change-Id: I42f5d2105fa4e91aaa57b55358aadb1fc7fd8339