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

Change-Id: Ibc40e0723c73f899510a6f1299bdda914a42cb58