Merge RP1A.191120.001

Change-Id: Id9b3f49d3c6a21203121d89aca0ec965d6adbcf9