27d276f3a6
(cherry picked from commit 20841a137beac5caa824e3586c7bd91d879ff92e) Bug: https://code.google.com/p/android/issues/detail?id=81155 Bug: 18556607 Change-Id: Ibdfebc20dce4c34ad565014523c9b074e90ea665