Merge "DozePlugin: Remove" into oc-dev
am: b2484f2258

Change-Id: Id660a1dcfd49aeb6f46285927696a822a8e8c8f9