Merge changes from topic "quant_coupling"
am: 76f5263d6f

Change-Id: I0ffce65aa794244b1cd30d62ff69ef3a836af539