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

Change-Id: I0c37ccefd4342180352dad8b286845db02f4db75