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

Change-Id: If4474aed7998bf4f4570ebdcc8c0eb6f00e97b4b