Bug: 16852844 Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729 (cherry picked from commit 9858af0ec6)
9858af0ec6