Merge "Fix mic enumeration CTS fail on marlin." into pi-dev
am: 0b5dd8e560

Change-Id: I681eb47ec1577ad6c2b35d0e739c249bf61f0f26