Merge QP1A.190205.002

Change-Id: Iad499f70b363f519d1e3a9312054ff163cb1964c