Merge RP1A.190822.001

Change-Id: I0435bee8d56c1c70017898bd8aaf5a9e16cf41e6