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