Merge QP1A.190228.005

Change-Id: Ib43278e4b5bd02c99f040e8fbfdd07aefcbc53d3