Merge QP1A.190205.002

Change-Id: I21ccfb1df8c1d460f4d3735dc37d658ea7c98251