Fix for Android L

Change-Id: I0f6e22bdcce32c010a12be0d8a1d9444232d1239