am 9484bb01: Merge "Support KM_LONG_REP"

* commit '9484bb01af2dd680e501db031dbcf2a6ecba8e26':
  Support KM_LONG_REP