[ANNOTATION] Patches from mailing list

Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>