OCD Fix

Change-Id: I9672cebe9e1db564886b4279f35ab96daf63a6d7
Merge "OCD Fix" into kitkat