Merge "Merge "Fix dependency versions" into oc-dev am: b58bb696 am: 974c7195 am: 4f0e5829" into oc-mr1-dev-plus-aosp