Limit chain name to 28 characters

Fixes bug 1103838

Change-Id: I90c0690433bac3ebe2de5b4cbbad3c358a889283
Latest common updates

Fixes bug 1132908

Change-Id: I726bc5b3199d2fa606832418db9b6e20ffbc3879
Merge "Limit chain name to 28 characters"
Merge "Latest common updates"