Bug: 21730722 (cherry-picked from commit 55536230) Change-Id: I25f76ce4794c4ee4caf4c85d35c318dac3b7bac8