Android CTS 5.1 release 4
merge in lmp-mr1-release history after reset to dedee688fdb89b55be2b130e3296abce98e12698