Merge "Shamu: Update battery saver disclosure text." into lmp-mr1-dev