Cut support for crespo / stingray - do not merge Bug: 4295425 Change-Id: I413fc89f5c9bec8c861f78a3cf407af0302b0418