Merge "hammerhead: Add mms overlay for lliad and Bouygues Telecom" into klp-dev