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

Change-Id: Ia3bea73b5b0b6c6cb0b7d4c531ec5313dd07a1ad