Merge "Fix truncated string in battery saver notification" into rvc-dev am: 1d650a22fb am: 5cf35198e4 am: a5a6b982f4

Change-Id: I7624f865938799d098c905672ad0a17b144bbae0