Merge "Fixes non-matching instant app behavior" into pi-dev am: 8d9f844004
am: f1c0afab02

Change-Id: I75fd84373b472e269f0c1ae5bb4473e0a763eb9e