Merge non-ojluni/-folder changes from aosp/expected_upstream

Test: n/a
Change-Id: I4e4f203d99537cada6256220e11525d7f922dd71