Merge "Replace xargs with other shell command" am: 18545d3852
am: 6aa4d948b9

Change-Id: I5f9d7149598e14dd446bd63722152a0757c86dbe