Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
am: c3fa6ab2ac

Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e