ugggggggh, ENCODING

Change-Id: I5771c75aca1db196669e9361e5d7ddab0b44e290
Merge "ugggggggh, ENCODING"