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

Change-Id: I012bac37763f3274c8b4957def211476e64237b9