Merge RP1A.191031.003

Change-Id: I6ee16b643a59ccb0401b5b9104e847f40a0a83ea