Merge QP1A.190228.005

Change-Id: Ie7c2562bc12bc8732495cb3c1d64be2513c11f9d