Merge 77dca3b6640352b02a15f8b5fb1d1425e9c4dc57 on remote branch

Change-Id: If00259276afad2da6e448cc1e33e3e388295ac23