Merge "String update for notifications" into rvc-dev am: eba37898c8
am: a77b8113cb
am: 0470f5085c
Change-Id: I73ecb70d35af4b86bd6805dac530533b4be24273
This commit is contained in: