Bug: 17390824 (cherry picked from commit 7b956ede) Change-Id: I5d804ceb5e69533584161bfed6787529cd8296fb