Merge remote-tracking branch 'aosp/upstream-master' into HEAD
am: bea3b4ca9b

Change-Id: Id61605e47032a1fc45657dd2bbab0e8a5caed414