Merge QP1A.190228.005

Change-Id: I56b87baf3c0d012c9fd425c9a4f14e81b322b4b0