Fix for 4.2.2

Change-Id: Ib3b88c83d2936871fbe25f1acbd10fd60c577944