syncing with lollipop-dev

Change-Id: I692aef166e1492e40069b3e8b179bdf5512a97d0