Merge "Fix potential build break" into oc-mr1-dev
am: 9d96622be4

Change-Id: I546c4dc1d74917ddfa2b74f8876160ecf4a9956a