Android CTS 5.0 release 3
merge in lmp-release history after reset to 91bceebd0bb15a5d20d43f8eca808114b96eb5ce