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