Merge "Add metrics for status bar" into oc-mr1-dev
am: 69f3e18e0c

Change-Id: Ic6fccfd3113f62ea6b8cfee0be683515d0553df1