294e683b0e
Reverting this patch due to issues with binary userdata.
This reverts commit 414243ace1.
Change-Id: Idf4048e064aa49423e45297f7a68168a2f5a7646
Closes-Bug: #1504235