Initial commit for lollipop
Change-Id: I552ef81116e62394aee8ce6e9d4ec2f4582fa798