Merge RP1A.191031.003

Change-Id: I5dc662920c03436bb886bd01b3f0786fb5e808a8