Merge "Don't require post-execution state for onActivityResult" into pi-dev am: 5007c67a70
am: 33fd905c37

Change-Id: Ia05f8c33ce038d76c3c1753ac58b6b82a3b6a679