Bug: 17503230 (cherry picked from commit 8017bfd1) Change-Id: I1a464688dfdf34ce005a20627ad82780cfc99cf7