Bug: 17784968 (cherry picked from commit b84f667e) Change-Id: I68fc2cc0a1ee7f0887edf3681eb83ef678de1383