Merge RP1A.191031.003

Change-Id: I5d4475cfcb87a55b8f26e1342222cdf6a94e57d3