Bug:
https://code.google.com/p/android/issues/detail?id=61600
Change-Id: I86ef4f69800c3271fe6e4a5b09a184b2de7f6bc9
(cherry picked from commit 309e97fc3c)
Bug:
https://code.google.com/p/android/issues/detail?id=61600
Change-Id: I86ef4f69800c3271fe6e4a5b09a184b2de7f6bc9
(cherry picked from commit 309e97fc3c)