Lollipopify

Change-Id: I97c0501623ee08d694ab1b68e1192ef4fc935186
version: 0.7.2

Change-Id: Ia8a9c4c07e912d9438b14cfa96d591f8efc165f1