Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev