Merge remote-tracking branch 'aosp/upstream-dev' into merge

Bug: 26807329
(cherry picked from commit fb9c9c8d5230956caa48501dad4fde4b90e00319)

Change-Id: I428ae6395d8c00db6baef5313b3dd47b68444bd9
78 files changed