Merge "Use pathlib Path.glob instead of glob.glob(recursive=True)" am: d858301a91
am: 3405612575

Change-Id: Ib5d8a907057257f7ca8f025ab34d125a7d046896