Merge "Include chrono.h" am: fc71730834 am: ef4d2b075a
am: 14fa1b7b89

Change-Id: Ibd9c79d999ea561bf61b3932e5b6695b0ec39370