Bug: 16956980 (cherry picked from commit 83715081) Change-Id: I3d0b18bfb9db24917f055f66f08f5f4168301867