more fixes for 4.2.2

Change-Id: I71370a896a6017cba3252b814c12a5f38b7adc19