Merge QP1A.190205.002

Change-Id: Iba6d392bc319c238fd2068207da9aa70e4ac757e