Merge "Remove no-op std::max call" am: c00af4c533
am: ef5e579cec

Change-Id: I140b00023b25f2609137eb223ba4641057a418b5