Merge QP1A.190306.002

Change-Id: I8fe9c9ba5d15071059f93840623185ef3828049d