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

Change-Id: If659a46ee06839ea48e0079a29e56087464f3e49