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

Change-Id: I4b22d7d07c4e895609af3ecf5e5ac6dbb958f68f