Fix Android 4.3 Merge

Change-Id: Iee4b8ebd40e2f0e3d72b327d1fb1e576c5bc98c6