Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
am: 2fac4fae3a
am: ab6d1522de
am: 9ae2332edf
Change-Id: Ib09ef002f85ff5b847dac88dca7f8e969741ca0c
This commit is contained in: