cherry-pcik fixes

Change-Id: I04a559526850487a7a4e7018818351cce66ce1c7