Consolidate all the dividers to provide same look and feel

Bug: 30017936
Change-Id: I072cb116dba1df555a63f3f67b730f7f9c3a235a
14 files changed