Merge RP1A.190822.001

Change-Id: I4c0156c27115ef97d179ff146bb367cd05c21786