Merge "Fix wrong usage of * in find command" am: b3502943dc am: 7323eeb32f
am: de7a4558c1

Change-Id: Ica6908ab76690c138f945363ee2c1978c268d327