Add and remove the unnecessary `encode`. Change-Id: I2fbbd9d3950d4b68eca9905839a1f910e5a8ce4a Closes-bug: #1853805 (cherry picked from commit ddfb07987b) (cherry picked from commit ce302d04ec)
ddfb07987b
ce302d04ec