More Black Majic!

Change-Id: Ib91e1b0458d604b6af691157763e8234582bfe34
Merge "More Black Majic!" into jb4.2