Bug: 21209641 (cherry-picked from commit 37fd5275) Change-Id: I043f59eeb601a95c7d01b10a844c2237167ee862