Merge RP1A.191024.001

Change-Id: Id0e8b73a963f632801bc5581cd18a967060414cc