Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev