Merge QP1A.190228.005

Change-Id: I979a6a565560b5e36b167e6d9819c200868df32d