am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT...
am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
* commit '1ae8a98e':
Revert "Add a way to override Xfermode DO NOT MERGE"