Revisions for Android 4.2.2 (JDQ39)

Change-Id: Ibe5c08d8cca592abf2c71c7b594d0be9cbd1b5d3