Derp

Change-Id: I331323d85cb2447bb300c82edd3274434912624e
Merge "Derp" into kitkat