Merge RP1A.190923.001

Change-Id: I224941548d029193329ae0cf388be6dd8e8e13a0