Android CTS 5.1 Release 15 (3619395)
merge in lmp-mr1-release history after reset to f6ca3a3f1bbe206e2fd05be36da10cb4204e5388