Merge \"Improve CC handling for immune objects\"
am: e92730cbc5

Change-Id: Ie0226a28ebfc44595e614c3c942fba82797ecfa0