Update for Android 4.3

Change-Id: I120ef9c0128fea87c71093a0c3fbf6f3eb0b4c7d