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

* commit '82f3053476c4b206847a7ab951d750fe1fd83b2f':
  Fixed incomplete OSEN config code.

Change-Id: I961605da35acb3978e9a25c6586b4ce4b8d711d5