Merge QP1A.190306.002

Change-Id: Ie61caae466745c520011269c8ce1a45ba32420a1