Merge "Note 4's" into lollipop