merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-dev