Merge "Adding test to check that ASN.1 lengths are properly encoded" am: c6b086785d am: b3ee534556
am: 96098b0cd9

Change-Id: Ic2736842dec7f78a2f75945d7cb19054d0430857