This reverts commit bc4f2ccf and re-enables the API for MNC. Bug: 19461292 Change-Id: I53b94bacb6a879fcc0598edfc0f3d44a9dd9e84c