Merge RP1A.191031.003

Change-Id: I069b564a2877a65a7a154c174e207def8bbfe9b7