nozomi: fixes for 4.2

Change-Id: Ib433c868995a5a54eefba104819b12082817d4d1