Simplify configuration and consolidate structures whose difference wasn't very clear. Bug: 27122760 Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de
Simplify configuration and consolidate structures whose difference wasn't very clear. Bug: 27122760 Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de