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