Note: Strings are non-final Test: manual Fixes: 261663929 Change-Id: Ia036a3bf715d10f94f17faf5b571896ca229a39a