Merge aosp/upstream-master into aosp/master.

Test: update_engine_unittests
Change-Id: I6cbf56a3644cae2d26e65d78e235ca5652a8c6e6