Merge "DO NOT MERGE: Instant apps might get IAE or SecurityException" into pi-dev