Merge "Increase the threshold for shadow test" into lollipop-mr1-cts-dev