Merge remote-tracking branch
am: 5cd50f8f55

Change-Id: Ibdf742d2a4de42b7c19eab1e281333fa0b04cb95