derp

Change-Id: I88c3f053eafab44a7946c7330c83571285a1d3a0
Merge commit 'f61e90e' into kitkat