Merge 8bc45356eb82fc4002c7a2d5a82667b094074765 on remote branch

Change-Id: I959893a31754067d031537ce6963cb9bb85e8a31