Also made it more customizable via attributes Bug: 25184308 Change-Id: I3cfd48b6bb964ea8db1539586ed70343fda5e40a