Fixes: 132217006 Test: atest ExtServicesUnitTests Change-Id: I1388fe97aa43aaf8d4eb9339aee5a96a9bf7fbad