Merge QP1A.190228.005

Change-Id: I9ca2b053d7579fa190b9de5804e02397c1520f17