Merge 32283f0ec6d5294e578f5be5835d43e76bee8aa5 on remote branch

Change-Id: I1ff9faf0d0dcedf7b1275141e51788a753592f41