Splitted from commit 5aa2f34, adapted to the Lineage SDK and squashed with commits c6dc688 and 19105ab. Change-Id: I7516c833ff39de6bdb36c815a5292606cbaa0533
Splitted from commit 5aa2f34, adapted to the Lineage SDK and squashed with commits c6dc688 and 19105ab. Change-Id: I7516c833ff39de6bdb36c815a5292606cbaa0533