Merge "Fix glob syntax"
am: 6a753ba787

Change-Id: Ia1bfd3f6323e557e17b2d6554a79582d504ed91d