Closes-Bug: #1509430 Change-Id: I4f3b60776230dec5ac0ee31369fbe95cb0a8cd71 (cherry picked from commit b97ef58628)
b97ef58628