Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 9a79a752c7 am: f8578bddcb
am: cc47d62c8f

Change-Id: I35e8b79af9d2b6bbd5ce800d422502364aae740c