am 5875362b: am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override" * commit '5875362b':