Merge QP1A.190228.005

Change-Id: I189f12b20cf5a7d8cdbec8b958c57532012f7da2