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

Change-Id: I0454663e5d672e92bb856b1ce8aa70e3a39bea0f