Merge "batterymeter -> just meter." into oc-dev
am: da4c81d942

Change-Id: I6500c46fc1b0fcbe290e9d610ac6506458ab9fca