Merge "Add keywords for AOD setting." into udc-dev