Bug: 21724724 (cherry picked from commit 2ada67b3) Change-Id: Ifa99df9ee9f3265038a0c0f7944e834e42c498d4