Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev am: 789f10fe12
am: e510562e75

Change-Id: Idb953e1b1a1b574e433d90d2f92b1a96c33808f1