Merge "Fixed bug in relying on precise FP in periodic sequence. am: d964e3b784 am: bb333ba1e1" into oc-dr1-dev-plus-aosp