Issue: https://code.google.com/p/android/issues/detail?id=60993 Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25 (cherry picked from commit 11ee746dc5e77f4f33aac45ac9e344444223012d)
Issue: https://code.google.com/p/android/issues/detail?id=60993 Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25 (cherry picked from commit 11ee746dc5e77f4f33aac45ac9e344444223012d)