Merge "Allow duration of some commands to be logged." am: 8385d699c9
am: 2a14748888

Change-Id: I9c28579b4e613214a4863cff04fea42d937021c1