Merge remote-tracking branch 'aosp/upstream' am: 91fa1c8b99

Change-Id: I032e8b1478d5aa46fe603dd346705c22bcefd581