Merge RP1A.190822.001

Change-Id: Ia5ae696280e076bd9bb9b02cf7390d24b30e10d8