Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004
am: e99586cfea
am: 36d4a23727
Change-Id: I01a325cf480a98749eac987642eebdfb09e1cd71
This commit is contained in: