Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Also a bit of code clean up. Change-Id: I541a9c9ec031b7075f2812ef938adb9e591757c5 (cherry picked from commit 86ccad0b)