Change-Id: Ib1185d417457d03efa102989a64b5b5e4eb5c82a
See https://code.google.com/p/android/issues/detail?id=181910 Bug: 22952485 (cherry picked from commit 66b6eb9490) Change-Id: I363f49b5b3c6b7b3ac08cba2c14d72c431588c5a
66b6eb9490