Merge "Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec am: f3310cb3b1" into oc-dev-plus-aosp