Merge RP1A.191031.003

Change-Id: I0bc9c9a2f86a4dd68e2222acad159cc66c87fd1b