[automerger skipped] DO NOT MERGE: AdapterService: Check the PIN code length...
[automerger skipped] DO NOT MERGE: AdapterService: Check the PIN code length before using am: bbeb2b75 -s ours am: 71eef7a9 am: c1174648
am: e37ee45d
Change-Id: I12f2c23b0a31887301b6675fdc2a2771144de651