am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES...
am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.
* commit 'e3e070ec':
Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.