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