Merge changes from topic "quant_coupling" am: 76f5263d6f
am: 75a93ac4b1

Change-Id: I4bfbe56f27e5725dbc0ebde7407969fd1832a2ef