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

Change-Id: Iee24871f486b8ef21e6992a101e97734377c6613