Merge "Allow duration of some commands to be logged." am: 8385d699c9 am: 2a14748888 am: 674dc9946a am: 26a81a88fd
am: 78772d9970

Change-Id: I3525ecf00452c29591a9e8c53e01b3d12521320f