Merge RP1A.191024.001

Change-Id: Iefa9785bbb388fcbe7bff367d6c9c25450333716