am 09286405: Merge "Marking two flags as final." into lmp-dev

* commit '09286405d1c3b3ace460521049989a6d662ba203':
  Marking two flags as final.