Merge "Don't always fallback to clockTick for EFFECT_TICK." into oc-mr1-dev am: b60141b23c
am: b32153e3d2

Change-Id: If9a5a28fc0ac20e63177945800518977b7aec872