Fix Android 4.3 Merge

Change-Id: Ib09d7f03e96ed2f722a596da68ba946ee24c7cf7