Merge RP1A.190822.001

Change-Id: Iab5605058425456acedc4de5ebe15f9461526660