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

Change-Id: I146732a5c5fc261651d59a1c6a498c3279d24a43