Upgrade for Android 4.3

Change-Id: I8c213079183b998bdd73940d866aa19a187e7065