Android CTS 4.4 release 4
merge in klp-release (no-op)