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

Change-Id: I62ffaa184420ebc3b13366b18fb0f8daf66e9e2a