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

Change-Id: Ic61ea35272cbf2d2e544f6aa3f7463f44de89ad0