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

Change-Id: Ibaa9a450f6aefc2f91942bb905f20e96f435ae54