Merge 78460add289442224b07c99b54f7cdeac65ec0e6 on remote branch

Change-Id: Ida3e57cba3f76b906c38594aaea7aac1bef458a9