Merge "Tests to verify OBB mounting on external storage." into klp-dev