Merge 796ae1b8ebac59378db3aa6e647a55b996b6cce7 on remote branch

Change-Id: I1be49342a2b72f11599caa8518dd26329ae7715d