Merge \\"Fix a typo in the atrace help text.\\" am: 133650e5b1
am: 97acea9a6f

Change-Id: I7a3d3921245ab300898a99f237b7bf5d80edda66