Mahdi non-caf.

Change-Id: Id0a7dec9c4127fdd25933170464cd08da007bd76
KTU84P

Change-Id: I73112664ac938b7774171524484cf4d27ab7e11b