Merge "Fix battery detail issues with "Android OS"" into mnc-dev