Initial merge from 'aosp/upstream-master'

Test: n/a
Change-Id: I3c92cac914950472118835e12eeaeb74fffc3349