Merge "Add battery to AOD"