Merge RP1A.190822.001

Change-Id: Ieecb2ea605dc7f327329d5920ff8a67be90198c5