4.2.2_r1.2

Change-Id: Iad5bd2af6adbf12c0060790d5865c1c1cbbc6ea1