Bug: 17679443 (cherry picked from commit 95a93541) Change-Id: Iba40291dead3f0b6715903c986370fd0cf1e41e1