Note 4's

Change-Id: I7c612cc77c49b961cacd55afa066dd51c8db5cbd
Merge "Note 4's" into lollipop