Rebase d2-common with cm

Change-Id: I40738d3f27e5c3c24338b3b2b857fe16cafc8d9c
Merge "Rebase d2-common with cm" into lollipop