Merge RP1A.191031.003

Change-Id: I855f2c8b8cea1e60f71b2825586507eb2cafd696