Merge RP1A.191031.003

Change-Id: Ie2c0b563a5571f677f468764ef7b8ab43c446bcd