Merge "Merge "Remove no-op std::max call" am: c00af4c5 am: ef5e579c am: f3310cb3" into oc-dev-plus-aosp