Upgrade for Android 4.3

Change-Id: Id104c4a5d13d7b2d57553ac26919bfc735092d76