Merge RP1A.191031.003

Change-Id: I49b72862a703c7f4a6ad0041b62e6112918363bf