Upgrade for Android 4.3

Change-Id: Id792675de63e4965a02761549aea21247e16b456