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

Change-Id: Ie2c2d6c3aadc351b1f332da53e73f5df44586fe4