Merge QP1A.181202.001

Change-Id: Ib398e1d17c506b04e9388672441e36d9dc17578c