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

Change-Id: I07668e5f9eb4c98c6193e89429d4a4c6d14ac0a0