Merge changes from topic "am-8ea55e01c00f43ab9a04f95d6999da61" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Migrate from blame to history scoped blame am: adef809ab8 -s ours am: a0e857181e -s ours
  [automerger skipped] Handle case where checkstyle does not return 2 lines. am: e1510db8d1 -s ours am: 66df0cc063 -s ours