cell-layout. Temporarily there can be a mismatch. Bug: 73346286 Change-Id: Id014332d585c73b2be92da1f24db82484f103de4