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