Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Also clean up a little. JIRA: CYAN-3164 Change-Id: I9b71a225996315f517b59d2d6f4074175bbf2d64 (cherry picked from commit 0af22dd7)