carry over encoding.
am: bfec8f5

* commit 'bfec8f58feb977598336a3d4ed86dcd9dd372b98':
  carry over encoding.

Change-Id: I51369a1fa214fd9175d0d4bc31d4097246679b62