Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53c -s ours am: ff115bff am: ccbac7e9 -s ours am: 76007bb2 am: 219d9b5d am: f05a6fc5 am: cf7ce06a -s ours am: f44b48ac am: aa8976fa am: 783253f6 Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329