Bug: https://code.google.com/p/android/issues/detail?id=78422
(cherry picked from commit 0adcf15ad8)
Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1
Bug: https://code.google.com/p/android/issues/detail?id=78422
(cherry picked from commit 0adcf15ad8)
Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1