Fix Android 4.3 Merge (Take 2)

Change-Id: I12ad4a26f7fad7871679af80fe49f0a059884aa5