Merge QP1A.190228.005

Change-Id: Ia3e3f1afc9046b806e4f624add32fbfdbcbc4dbb