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

Change-Id: I67e3879985fcc7e80bb50c2b65ee08ee2a226800