Merge 46bdfc7080b37119a8e2972af01136d61ee5cb90 on remote branch

Change-Id: I97539b1fe621ad9c8d5377d836fb77a8354d511f