Merge "Don't fail when no glob match" am: e04aa9e03a am: 5bab487f23
am: a303f9e6e9

Change-Id: I20de1fc5a457cae6b9f191904e3ea0c63e051a1d