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

Change-Id: Ic54ae913ec5f9418f81ad15437fbaca8b96fad15