Merge QP1A.190228.005

Change-Id: I7d18d9a759fec49813852771875db2b31a25d98c