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