more shz

Change-Id: I272909476417ffc208948694285aaaea0ce86b1d