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

Change-Id: I700e85d2f6c504e92e9120f492147b85ff6389a6