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

Change-Id: I978bf2eae2d5ed056b1d3b7cba01bf4886f54b0e