Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master