Bug: 18156619 (cherry picked from commit 2169e17482) Change-Id: I4a7f5bb9ad4c27b274f3a3c86c1617ca0578b98f
2169e17482