f86e0e4b88
(Initial CL removed padding always) I0f9cce376d47918e69a65ed288f10143930ee3be Bug: 375661139 Test: confirmed with design team Flag: EXEMPT bugfix Change-Id: I467d0a5ae3ab48ebebc5a05f7a0902ddd01f8084