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: bc562b18
am: de5d2e88
Change-Id: Ia40e778b74941bce7cda9e13643684c2eb96caa7