Merge "barometer: fix barometer apex build"