Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Simplify configuration and consolidate structures whose difference wasn't very clear. (cherry-pick of e4c50de7, Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de) Bug: 27122760 Change-Id: I6320bd4c960e4473b4bf3c28e54a7ba492fa2cf9 (cherry picked from commit 581a4f7b)