Merge RP1A.190923.001

Change-Id: I256c719b6f5b136c04be4558b7ea0dce9f84a4ed