Bug: 18143314 (cherry picked from commit 7dd72618) Change-Id: I70e708940663bf53ebe5320f53fd2dcebb0c623f