Merge "Fix an exception while scanning apex packages" into rvc-dev am: 2aab1a4d am: 26870cfe am: cea5e93b am: c0c0d56a Change-Id: I109467145ee039e980df29a6e7272f8a05586c83