Bug:
https://code.google.com/p/android/issues/detail?id=156314
Change-Id: Ib95efa2767aa52cb2e11195499828ca41e58eb50
(cherry picked from commit 8c719cece6)
Bug:
https://code.google.com/p/android/issues/detail?id=156314
Change-Id: Ib95efa2767aa52cb2e11195499828ca41e58eb50
(cherry picked from commit 8c719cece6)