[automerger skipped] [DO NOT MERGE] Resolver/Chooser - Fix 'no apps available' inset am: 7b63d6ec1b am: d3a8facea2 -s ours
am skip reason: subject contains skip directive

Change-Id: I8e5bb7f9209e95ae330f9d18343fcb4c53f5dbdf