Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-mas"