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