Merge 26adea87a32005019436439f016545d3c3a80fb6 on remote branch

Change-Id: Ia8e2334471dd404227665e94f2d4689099322f86