Merge RP1A.191031.003

Change-Id: I78b4900caf1300ad4d750527ee2bd2bc31cf0175