Merge RP1A.190822.001

Change-Id: I8147a0fef74391a0ff55693ab217c1cc25620912