Merge "ACodec: query grid config from component even if grid is disabled" am: b43bb0b1d9
am: 8138773ff8

Change-Id: If2be22a195a0fb3b4ee26691d812c2ce0871d517