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

Change-Id: I7d2096676885bdd44285914e18a242fd4f5b49d0