sync with CM

Change-Id: If8fa5e6b246708a94678f17d4d5fb7f886860e68
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "sync with CM" into kitkat