Merge RP1A.191024.001

Change-Id: I0dd9b6abb794b7e46fe47abe6622b3c3a05b8e2b