Bug: 18027433 (cherry picked from commit 44a35066) Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf