Merge "SF TimeStats: fix missed frame logic" into pi-dev am: fbcca043cf
am: f54bed5d70

Change-Id: Ia92110c169292ba6c8af8ebb5f5910897702a5f3