Merge "Merge "hiddenapi-mappings: Hide ReferencesHidden errors" am: 3cfdb948 am: f1f26e11 am: b2d80c1a"