Merge QP1A.190122.001

Change-Id: I573f324a058e34abd51823b8ad1988ec56a58a86