Test: visual Bug: 63903361 Change-Id: I3e4dc74e960f212985712120341d3a80543c96db
Still needs a bunch of code cleanup, but this will get a version into the tree for testing. Test: visual Bug: 37013646 Change-Id: I29800b57d80ea120c691663392f368c17325ab54