Merge "DO NOT MERGE: fix another break" into lollipop-mr1-cts-dev