#rb none #tests iOS / Android [CODEREVIEW] Andrew.Grant,Daniel.Lamb,Justin.Marcus [FYI] Pete.Sauerbrei #ROBOMERGE-SOURCE: CL 4898958 via CL 4898963 via CL 4898965 via CL 4905881 [CL 4906509 by thomas ross in Main branch]