Adjusting strings and margins Test: visual Fixes: 187868912 Fixes: 187853607 Change-Id: I976d0b8b2067556ed95e4610dd6ea3b85e6fc82f
Test: atest Bug: 171191376 Change-Id: Id7208312dff0cc022c2f16b3872fae1a9dc09ed7