bionic - Revision 89045: /airapps-fixes