Bug: 17913995 (cherry picked from commit 052d78f3) Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c