b5228ac076
Bug: http://b/19059885 Change-Id: I15f70b434b1d450e5b62ca7c204c628e2dc9edcc (cherry picked from commit 2e84bc6948bb24ec67bf289ee1d0ed937a0fd4ff)