Merge RP1A.191031.003

Change-Id: I52759b6a96c45fdb0dac9d37acdced3f652541df