Merge RP1A.191031.003

Change-Id: I70ed4ca872dbc103c99876062f9ebdc7b3395d9d