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

Change-Id: I0f4f70aa104ee01030c2acd0c189bd9182e1e08d