Merge QP1A.190228.005

Change-Id: Ibd3643d3e6ee8b45743bfab7be5d98f52d51b32a