Merge "Show wifi and bluetooth item in battery settings" into oc-dev
am: 21d2403c67

Change-Id: I7ee542befa8e5287dbd73be242ec812a1a5d0c19