Merge RP1A.191031.003

Change-Id: Ic403742edb99c7ec1e3b09beafd1378a02ab8fbc