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

* commit '13bbf68a7d2169473b9a47c3084e7d1325eb83d3':