Merge "Fix glob syntax" am: 6a753ba787 am: ffd7ccc057
am: 044a6a4580

Change-Id: I4fbd71d520d22f8e374ab5a6630a0d8831a6f2ef