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