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

Change-Id: Ibc17b50afb80322f001fcae1d530e62e6f3ba4b2