Merge RP1A.191031.003

Change-Id: I394dbb43ca44d08b76c3caa98e884bfa5a6aacf3