Upgrade for Android 4.3

Change-Id: I62e903fd02c8ebdc57caa51d95c53ac1475e9fd4