Merge "Revise cts-ref-aosp plan" into oc-dev
am: d759dd6c30

Change-Id: I8649e08e741d0aa48b561937a2b73582a9c9201d