AOKPify more

Change-Id: Id97275be5f4524ac6d7aeda278e19b923cb82a53