Merge RP1A.191031.003

Change-Id: Idd2b96b53ced80850b3842edda82f3b6e3151d8a