tree bc297fdd8881e3ba612a862995f7a93baff91acb
parent b0b24baabf0aad7842839886e84b7b6b3fd4fee7
parent 7663233f5cbbaafdc6de435c3705be46d74f7e49
author Mikhail Naganov <mnaganov@google.com> 1574446951 -0800
committer android-build-merger <android-build-merger@google.com> 1574446951 -0800

Merge changes from topic "upstream-close-fixes"
am: 7663233f5c

Change-Id: I67e3879985fcc7e80bb50c2b65ee08ee2a226800