Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev...
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d970 am: e99586cf
am: 36d4a237
Change-Id: I01a325cf480a98749eac987642eebdfb09e1cd71