Merge "Fix the red build." into oc-dr1-dev-plus-aosp
am: 4e5e0fe078  -s ours

Change-Id: I7664379081cc2e6303a907a6405571a703b3e4db