Merge "Fix CC table lookup tests"
am: cc5d5f9eee

Change-Id: I3a2a9784a7c1995adf40709758b895115a075977