Merge "Layout string data" am: 591654e70f
am: 80aba913db

Change-Id: I4de5faafae825a3f38f1aa75ebd55943f5c7b40c