Merge "CDD: Require checking the primary authentication periodically" into oc-dev
am: 504a21b42b

Change-Id: I35556fd6e22a1df2bd608b307c6df6bd494f5c10