The warning message stated this was to happen in OSP-N. Change-Id: Iedc9d703d49eeabffa50de49a1d33e2fc4c6e77a