Merge \"Merge \\"DO NOT MERGE ANYWHERE: Bump CTS to 5.0R8\\" into lollipop-cts-dev am: 68e28793a6  -s ours\" into lollipop-mr1-cts-dev
am: bc927019d8  -s ours

Change-Id: I0602ff348cb2bb459d85775dce15bf6d706f0c46