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

Change-Id: Ifc2015508739226259f16672f2176623397fe5ab