Merge "omni: add OmniChange" into android-8.1