Merge "edits to the lollipop highlights" into lmp-dev