Merge QP1A.190205.002

Change-Id: I8edab6a789aac568fc010ff94a852d89f4f67750