Bug:
https://code.google.com/p/android/issues/detail?id=183077
Change-Id: I86d1d8e07e42e9e295364b002e7e1534d4d9d5cc
(cherry picked from commit f82032fcf9)
Bug:
https://code.google.com/p/android/issues/detail?id=183077
Change-Id: I86d1d8e07e42e9e295364b002e7e1534d4d9d5cc
(cherry picked from commit f82032fcf9)