Merge remote-tracking branch 'aosp/upstream-release' into fix

Bug: 28860984
Change-Id: I9eaf67f53f9872177d068d660d1e051cecdc82a0