needs some antilasting fixes with aospa

Change-Id: Ib679f7adc65e4ada35e8feb6a0a9a38f22feed84