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

Change-Id: I9269f44427555987f5e5c169d9bfa68bde07c964