Merge "[Bouncer] Move expansion constant out." into tm-qpr-dev