Merge "Fix build breakage after the merge." into oc-mr1-jetpack-dev