Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
(cherry picked from commit 84333e04) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613