Merge RP1A.191031.003

Change-Id: I82342158c2c6d9d6b6fc03d4cbe6d2060618dc03