am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev

* commit '2905cafcb898bccb1f52e77f3c2f7eb5fc9fe01f':
  Follow up to I495ce480c25de24b6433adebdfe923b637d98f66