Merge "Fix an exception while scanning apex packages" into rvc-dev