[automerger skipped] Merge changes from topic "quant_coupling" am: 76f5263d6f am: 75a93ac4b1
am: 2f49a4e5c4 -s ours
am skip reason: change_id I1b0d1e987ebccc6700dd172b4222f9996105513d with SHA1 04bf939c7a is in history

Change-Id: I01a0c8af357929698560a959403aedfd131351a1