Add option for direct only cells for api level

Change-Id: I87f86a2aca40295d50179b3142712aaca331f9d4