am ec585647: (-s ours) am f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev

* commit 'ec58564768e4aebb71910ed6066ce523bc14991c':