Bug: 19067882 (cherry picked from commit 50d23adf) Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49