Merge RP1A.190822.001

Change-Id: I188e35f95419d437a9cff9df65ae24c917a4fee4