Merge "Fix bad auto merge conflict resolution in CC"
am: e0dc90d986

Change-Id: I09c16207232d018583ccbb18c07ee17496282823