Merge "Fixed incomplete OSEN config code." into nyc-dev am: 82f3053
am: c9c4f97

* commit 'c9c4f9771665f9a64512cd399cb86600a7be3f02':
  Fixed incomplete OSEN config code.

Change-Id: I42c9809b86a55c3bb6e04b78f82d7e74cfc007d0