Merge QP1A.190228.005

Change-Id: I59d055f000ba6c34375241122aeed6d3b905d7c6