Bug: 16218394 (cherry picked from commit 60ed7da4) Change-Id: I4882b3b6bb97facb8fca4c7ece65f4c7c96c57fe