Bug: 18355427 Change-Id: I5c5b38e6680bdd648273a3b4a2327f9c9a0a5b91 (cherry picked from commit 993e0e23)