[automerger skipped] Fix the LE CoC SL4A Test failure due to length check am:...
[automerger skipped] Fix the LE CoC SL4A Test failure due to length check am: 8635697a am: 8f268406 -s ours
am: 8b8ecb4d -s ours
am skip reason: change_id I9bbcd58460a02394010f74a18e9ebdbcd546d43d with SHA1 3deb5ec3 is in history
Change-Id: I13ae803112b66d9d55ca2fc7002a09b7c47fdfce