Merge RP1A.191024.001

Change-Id: Ia87bdd95c8f51e6fdb6ce86b473189bc073862bc