Merge 80e30545ddeac3700f116af6aa730c742022e080 on remote branch

Change-Id: Iaf21c7c795505011529efff945f819277e5a2b03