Merge "Add debug for ANR" into lmp-mr1-dev