Merge "Fix multi user battery percentage" into oc-mr1-dev
am: e603a67a62

Change-Id: Idb21e3af999e42d90e0f6fd453b13183bcdd8489