Cleanup: Taking over for N7 2012

Change-Id: I6af042933323d6ef4a4482802ed9b3a4190530e0