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