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

Change-Id: I08fadc10049bc33bb7a79dcf8a91306a54c4d87c