Merge "Merge "Fix potential build break" into oc-dev am: 7740a78495  -s ours am: bb4c42ccb7  -s ours" into oc-dr1-dev-plus-aosp