Merge remote-tracking branch
am: c853e41638

Change-Id: Ic7add604c7869c46bfa5ce371d3f8391c9d39bd5