am 6a6bcc2a: am 8b9da2d4: (-s ours) am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions"

* commit '6a6bcc2ab999208e32527b3c0dd5ac343b31abbf':